merge trunk
authorKenichi Handa <handa@m17n.org>
Wed, 28 Dec 2011 04:29:55 +0000 (13:29 +0900)
committerKenichi Handa <handa@m17n.org>
Wed, 28 Dec 2011 04:29:55 +0000 (13:29 +0900)
commitc8685d6906500b27c6d6ff0b075a3f60adb5b750
treead0e353ff3588ad3f97163aa60797e9c9124c3d0
parentac0c42c328b49617048391ee47a476fba6ad5920
parent1875e2fd872d4d3803188decb092f7bc078b1aae
merge trunk